debian/test.sh: Unexport HTTP proxy variables for build-time tests too

diff --git a/debian/changelog b/debian/changelog
index 69eaf56e0a3319330ffde8d0b88e995714c299c4..432192be6129eb10902b9a45e6eb5af51dff8827 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ ostree (2017.12-1) UNRELEASED; urgency=medium
   * Unexport HTTP proxy variables in autopkgtest to work around lack of
     support for no_proxy, which breaks the tests on Ubuntu autopkgtest.
     We don't actually need Internet access, so this is OK.
+  * debian/test.sh: Unexport HTTP proxy variables for build-time tests
+    too
 
  -- Simon McVittie <smcv@debian.org>  Tue, 03 Oct 2017 19:14:14 +0100
 

diff --git a/debian/test.sh b/debian/test.sh
index 97c5464667829fdc41c716ee9b4e9d8a7f14a41e..f23a06f4387d55291f08eb63e2e9111b24f715b4 100755 (executable)
--- a/debian/test.sh
+++ b/debian/test.sh
@@ -4,6 +4,15 @@ set -e
 
 export VERBOSE=1
 
+# Ubuntu autopkgtest infra provides internet access via a proxy, and
+# buildds could conceivably do the same, but libostree doesn't need
+# that. However, libostree also doesn't support no_proxy, so it will try
+# to use Ubuntu's proxy for localhost, and fail to reach itself.
+unset ftp_proxy
+unset http_proxy
+unset https_proxy
+unset no_proxy
+
 try_tests=5
 
 failed=0